More fixes for empty directories