Updated to default to use the shortcode when upgrading. Prevents
problems with upgrades.
Updated compat.