More changes and compilation stuff