Updates and fixes to a number of things