Fix some cases.