Last few comilation errors squashed