Escape-analyze works
small fixes