Multiple small changes and compilation errors removed