Correct various minor things