Case 3994 - Fixes after CR and coder.