Fixes before wp.org release