Fixed PRD-1213, PRD-1232

Added minor changes to test human-readable messages. Fixed reported bugs.