Fix some bits