#17 build corrections