Adjustments to run against version 2.57-dev (with GPU support).