Fix Shye's mistakes