Fixed a couple of compile time issues