A bunch of little fixes found with trail and error.

HULK COMMIT