misc cleanup
try to fix like for WP 3.6