Bug 2245 - fixed multiple types of issues