Corrected match error and variable name error as prompted by Oxygen detecting the errors.
Corrected match error and variable name error as prompted by Oxygen detecting the errors.

cjungmann/schemafw,cjungmann/schemafw,cjungmann/schemafw,cjungmann/schemafw,cjungmann/schemafw