140507 fix issues