Misc fixes. 2014-05-26