Pull in minor changes from Moses