Build adjustments, no longer doing weird hacks for now