Numerous overdispersion bug fixes