Minor fixes and updates