Fixes for default file locations