Merge pidfile fix.