Fixing MID-1901 and MID-1902. Eliminating some of sysout messages.