Various fixes found by MR members