Bug fixes with widget integration.