Updated for some Mozilla/Opera compatibility