HRS - Fixed minor bugs