Resolving more warnings