Language improvements (thanks Peter!)