Firefox and Safari Fixes