fix import
fix flag declearation
fix client