3207# A few minor improvements