Minor updates to functions