Further fixes to the N1kv plugin