Minor fixes for Linux Compilation