contentprepare fixes

contentprepare fixes