Fixes for croogo 2.0