fixes to try and get multiscan working