Fixed issues encountered with compilation on linux