Minor Error fixes II