Fix haddocks (good point, peti! refs #5)