Add some modules and remove OSX for succesful build