Fixes for Bug 1773