schema and model syntax fixes