Some (potential) fixes