Resolve thumbnail issues