Fixed bugs in patch 4.21