Fixes to GA