Address final PR concerns