Various fixes from testing of last week's work