#6 Wordpress fixes