More windowbuilder migration fixes