Fix trackOptions methods