Fixing a bunch of small bugs that @incompl pointed out