Misc corrections.