HR137 & HR-150 minor fixes

@2j2e