Added fixes for global