GIA-2925 Fixes scheme