Global fixes for global update