Fixes to gstack analyzer