Bug #1816 small changes and notes allowing tests to pass