Fixed minor issues to update master