NIdale fixes