Fixed more compiler warnings