Fix things, especially naive Bayes