HR137 & HR-150 minor fixes