Fix various bugs from the L4 conversion.

Fixed various bugs left over from the conversion from L3 to L4.  This
includes the ability to upload photos inside CKEditor.