Fixed some nvpquery issues