Fixed dirs issues