Some last mods before sending to wordpres.org