Address multiple version 1.4 incompatibilities

See issue #32 and commit log for more details.