Modular building and linux fixes