Bug Fixes

Make sure it works with the new version of WordPress