Fixed minor issues (comments from Carlos).