Sermon bug fixes