Fixed discrepancies found during documenting API