Fix all pending bugs