Fix for pid and surface handling.