Fixes for latest CF and Ruby etc