Fix missing empty guid
Fix little issue in base64 module
Optimize code in data