Fixed a couple of build issues