PR quick fixes