resolve build issues