Fix issues reported by jvasquez