get-images fixes and hacks