Fixed more cases for MDEV-6282