Fix issues with PLEX exercises - refs BT#7839