Fix some gaa logic