Minor updates to stuff