fixes for default locations