Extra fixes to viewport scale.
Trying to fix with another approach.