Resolve compiler warnings