A couple bug fixes and enhancements

This resolves a couple upgrade problems I ran into when upgrading from 2.05.
Why instantiate the @chars variable here, only to let it go out of scope on the next line?