Fix some stuff after interactive testing.