Bug fixes in update