Bunch of small fixes that I forgot