- fixed build issues