Use puma with some fixes