Fixed missing/duplicate data type declarations and fields