Fixes that came from small fixes during presentation