Ensure the right puma is loaded
Improve keyboard handling