Bug Fixes after Testing circular object references