Patches for STEP Core and Extended