Fixes to HTTP scanner - works great!