Draft/Post integration fixes