Fixed 2 bugs, noted in Bug_Report