Use case fixes suggested by Elisabetta