Improved compatibility with subfolder WP install