Some small changes to update code