Squish images, fix sample builder issues