mTPABinaryLocate + small changes