Distributed: fixed minor bugs