Fix some CS problems after last merges