More engine tweaks