First pass on problematic pictures