Fixed some of the compilation problems