Fixes after demo