fixes for widgets and other modules from base and core