fixes for new widget handling