Small PR fixes