Add viewport fixes.