a few more updates as per PR

Signed-off-by: Fotis Georgatos <fotis@cern.ch>