More widget fixes