Doc and schema fixes