A bunch of changes to compact images