community-driven fixes - EDUSTARS