Fix: Some working dir changes