Translation System Fixes