Various updates and fixes.