Fixed a few build issues