Bug789 v1.1 part2

Update PR with misc fixes.