Fix bugs rev20140827