Fixed Linux build bugs and confort effc++