Version 5.5.0.4

Minor bug fixes and enhancements