Bug 2966 2967 2488, all only small changes