Fixed dumb stuff