Fix PG counts and refactor FS creation during setup