Add: more minor changes and fixings to the building system (for windows).