Add: more minor improvements and fixings to the building system.