Minor bugfixes to DuplexMaker