Fixes some gaa logic