fixed build issues