Small tweaks for performance