Fixed problems with version checking

Also fixed a reference to 't'.  These should have been in my last
pull-request, but I forgot to copy them to my repository.