Fix some semantic