fixed a few build issues