Fixing some build issues