Fixed a couple build issues