Fixed up the build issues