General minor updates and fixes