Implemented few fixes