Jfarid 140908 fix issues