Fixing dirs more