Better piface handling.