Fix some more WordPress Coding Standard issues