tried to fix libreplanet and mediagoblin, but I'm not sure they're correct.