Adding last fixes across browsers