Fixes related to switching content types.