Fixes on initial scale