Update some minor modifications