Third-Party Fixes - EDUSTARS