Updates to fix weird 19 codings and misc other weirdness