partly fixed build issues