issue #24 build fixes