Fixes after workshop.