Fix for bug 2488, 2667, 2672, 2675