more dumb fixes