More fixes related to pixel scale refactoring