Improved Handling of Cover Images