Small fixes

Tested on WP-3.9