Presenter fixes