VLB-31 Fix image issues