Fixed return vals and arg escaping