Minor updates there and there