HRS - Fixed some conflicts with DB-migration