Make fixes suggested by @chrisdembia.
Make fixes suggested by @chrisdembia.

Gjacquenot/simbody,chrisdembia/simbody,elkingtonmcb/simbody,chrisdembia/simbody,elkingtonmcb/simbody,chrisdembia/simbody,robojukie/simbody,scamille/simbody,simbody/simbody,elkingtonmcb/simbody,robojukie/simbody,robojukie/simbody,Gjacquenot/simbody,scamille/simbody,scamille/simbody,Gjacquenot/simbody,simbody/simbody