Fixes for Linux Build