More fixes and Robustness changes

Signed-off-by: Reinaldo Penno <rapenno@gmail.com>