Fixed some minor issues...

...but the big one got away.