Fixes for Linux Compiles