Some housekeeping and typo fixes