analyzer fixes
v0.21.0