Fix https://github.com/nens/lizard-nxt/issues/330 and set make transitions consistent