Made some change to make code compile on linux
Some more changes to make all projects work with linux