fixes that had not made it into git for some reason