Fixed additional warnings