more uint -> guint fixes