Various updates to keep up with changes to the language