Fixed device scales

May need to be fixed