Fixing base dir issues
Fixing various smaller issues