Fixes for Presenter

Thanks for noticing @tonyhk