Minor fixes + WP<3.8 update