Few small performance tweaks