More work on getting headers correctly made available