Some mtl behaviour changes