Kuan - Fixed bugs 2628, 2582, 2445