Simple changes to prevent SS3.1 throwing compatibility errors.