Fixing cross browser issues