Nancy fixes