Update to work on Jameson's recent changes to system image stuff