Quick fixes and other updates