Some updates to GO handling.