Small tweaks hopefully helping performance