Fixes for separate base and page title