Fixed some build errors when moving between machines