Fix some problems of syntax