Backport UI fixes that were on resource-refactor branch, makes it stop asserting like crazy on debug