Fix bugs in s-expressions evaluation