small fixes
update null check annotations
Merge branch 'pu' into builders