Fix type of lifetime variables