Nabvar fixes