Forgot some file updates this should also help fix some build erros