Fix Xvfb target errors and case