Fixes for use with cf-grid 0.9.0