Fixes for title handlers, thanks to aapa