Bug # 4558, 4560, 4495, 4540, 4544 fixes.