Safety push before big rendering changes

Few minor fixes/improvements.