Some additional fixes for schema conversion