fixed some build issues