Minor updates to common utils.