Misc corrections up to 627