Fixes in presenter