fixed build issues/warnings