Fixing couple more case problems.