A couple of small changes for compilability.