Fix several comments