Cross-browser bufixes