Sri | Fixing some more Directory bugs