Clipjump v6.4 stable

Minor changes from v6.4 prev1