Fixed Image service bugs