Bug fixes (extends no longer supported)