Small compilation tweaks