Fixes

Added some cleanup for the scanner session