Some trivial modifications.