Build config tweaks and another batch from Develop