Fixed device scale issues