Squash a few more compiler errors.