Standard fixes 6.1 IS

Hi,