Bunch of little fixes.