WIP: address @ogrisel comments