Fixing some bugs in level 24