some build fixes :S