Some doc fixes suggested by scrutinizer