Dragon's Dog mother: Bug fixes

Bug fixes