Took care of some small errors shown when error reporting is enabled