- rel 4; tiny fixes from debian