Improvements to handling of SmartImageControl