Remove more compiler warnings