some build fixes