Put in some final fixes to prepare for release