multiple fixes, cdn datatypes fix