one more round of fixes

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