Fixed little discrepancies created by the last merge.