fixes to proper build