Various updates/fixes