More fixes for wordpress.org