Some fixes
Fix bugs
Fix bugs