Fixed some more compiler warnings