Correct patches; fix for panopoly_user picture issue