Dumb fixes for dumb bugs.