Update a few bugs