Small updates from comparing WP download against the repo