Fix unbury bugs