FIX language composition issues