Some small fixes
Dir change