Fix remaining PR issues