Fixed build issues from merge, project should generally work now with VPC