PropertyImage fixes