HR-194 - bug fixes

@2j2e