Fixed more Firefox and Safari compatibility issues :ok_hand: