More Nancy fixes