Additional fixes and updates