image related fixes