Bunch o' fixes