Fixing the broken stuffs