last fixes related to image storage plugin