Case 2796 - Fixed some issues.