Minor changes to the picture scaling