Fix broken stuffs