More Form conversions
Correct a few issues reported by scrutinizer
Merge pull request #182 from geekwright/forms3

More Form conversions