[tritium/design] - various fixes