Build target tweaks