Fix some cApS issues.