Tukui Fixes
Fixes