Fixing build errors after moving over to github