fix for new upstream release and cleanups.