Get rid of a few flattens