Fixing client to cope with base/aux image separation.