Resolve more warnings