Fix issue #630 - Warnings for Content Elements and Modules.

Editing and creation of Content Elements and Modules was causing
warnings.