fixes for Croogo 1.5