TRYON: Hotfix 1.1_1

Minor bug fixes