Fixed relative directory issues