#1051 misc fixes
#1051 pending changes