20140616 fixes