Tweaks for building in different environments