Minor updates to source