Some tweaks to make it better for .9.0