Merging fixes from wordpress branch