Fixed WP errors