Dragon's Dog mother: Unity bug fixes

Unity bug fixes