140429 fix issues