Lots of little fixes for Uzi