Sync a few changes from cvs head