Clean up dir loading and fix issue with multiple starts