Fix directories issues