140416 fix issues