Working on warning issues