Fixes for GA