Fix some superfluities