Feb 20, 2014

Misc fixes.