Fix for public image ownership

And reminder comments