fixes after workshop