Fixes for various goko updates.