Bunch of small improvements