Final viewport fix