Fix rendering regressions (fixes #883)