Build file tweaks