Bunch of tiny fixes