Minor fixes
Wow, one more commit