Irrelevant fixes