Fix bugs with content view mixins