A few dumb changes