Fix some broken stuffs