Fixed issues raised on GIT