Minor changes related to HR-325