Fix some minor issues in review and travis tests