Janitor PR improvements