Bugfixes for wc_page_hook