Fixes in namecleaning and some monitor adjustments