Some build fixes for Linux