20140516 minor fixes