Committed changes to compile on Linux