dfb5facf pluto: fix some stuff