Fix discrepencies