09062014-6 - Minor changes