Fixed #847. Fixed some subscription schemas.