Fix shell escapes and adding return 0