Minor fixes and update