HS fixes and responsible-ness