Trivial changes

Just a few trivial changes across several modules