Small improvements to image alignment and paging