Fixes t00xx

Second version, taking reviewer comments into account.