Scanner allocation fixes