Fix some designer regressions