Minor updates all around