General fixes to the onediary wrapper