Gauntlet: Bug fixes

Small bug fixes