More fixes, works fine for burying as well.