Documentation fixes from Marco Bodrato