Fixed some base path issues.