HBRI fixes