resolve build issues, update build