Fixes for schema 1.2