Language tweaks and fixes