Fix compile issues for new basetypes