Added fixes for cross browser behaviour