Fixes for schema module