Fix bugs as review of WordPress.org