Fixed some Firefox compatibility issues :ok_hand: