misc: performance tweaks