Fix two bugs produced by boidae