Fix issues with standard datatypes not being imported correctly.