Fix some cases