Fixes typos and re-factory throw errors