Fix dumb issues