Fix some other discrepancies