Some improvements about Apache manifests/templates