A few language tweaks