Fix: some small incompatibility of data type conversion