Various updates

Various updates