Build and config tweaks