Image related improvements