Misc. bug fixes, 1.4.30 release.