Various updates to platform