Few bug fix's.