Minor bug fixes in Update