--HR-227 minor changes