Cleanup and fix issue with issued snoop address