Fixed some compile time errors with last few changes