More fixing of Build System