fixes to handle new directories