Extra addons fixed and backported to V8.0