140505 fix issues