Bunch of small misc changes