Widget fixes