Fix some dir making problems