More savanna fixes