Added viewport fixes