Fixes from last nights presentation