0.2.1 language fixes