Further improved compatibility with new weekly bundle(s)