Updated to compile on Linux