ga and hero fixes