fixes for GA