Fixed many build system things