Presenter bug fixes