Latest finagle, fix now broken code