More trivial modifications