Fix bug with no-global-error s forms