Fixes for old WP version