Fixing more compiler warnings