Fix some bugginess