Various updates to improve performance and reliability