A few simple commits

Just a few simple commits back-ported from my local repository.