Fixes that the port apparently never quite got around to.