Minor changes

These two commits are unrelated but should be no-brainers to merge.