Topic: performance tweaks