Resolve more compiler warnings