- Fix base directory issues when called via command-line