Tommy, you are correct on those bugs. There is a mod (see OP for link) which corrects them.