Some tweaks recommended by RM to make PG start up