Minor syntax tweaks and typo fixes