some additional PR fixes.