fixes for updated iktomi.cms master