More language bugs sixed