Readded some proxy m2m tables that didn't make it into south