Dumb fixes