Fix even more compiler warnings