Various build tweaks