Initial bugfixing for imagex_aggregator_social refactor from social. Lots more to do.