Improved boat and minecart collision code.