Fix some Firefox bugginess