Fixes for Craft 2.3 support.