Fixed validation for image, device