Fixed issues reported by mattsc.