Fix a boatload of n+1 misses
Heroku merges..?