Make the transition to/from the scanner a little better