resource and schema fixes