Multiple bug fixes and additions for 5.4.2 release.