fixes to build properly