Misc fixes

just a comment: i didn't really check all usages, but we should be careful that widgets are not asking for more data than what they really need