Add missing dep. and rethink how we're dealing with content headers for #13