Code robustness
Fix and tweak travis CI config generation