fixes related to https://themes.trac.wordpress.org/ticket/20593