More non-default-type-size correctness fixes