Globalpath fix.
Small changes.
Small changes merged.