Clean global fixes