Sitecore 7.1 compatibility improvements