Various updates and fixes