Stage 8. Fix bugs

After using dll in console client