fix issues as per #234

Signed-off-by: Fotis Georgatos <fotis.georgatos@uni.lu>