Bunch of minor bugs