More stupid fixes