Build tidyups.
Fix for debugger.
Debug checks for addresses.