Resolution to the errors from last commit