Fixes for Silverstripe 3.1