Fixed some discrepancies