More wp 3.6 compatibility issues solved