Various updates and fix attempts