Makes some small changes to tweak performance