Fix multiple pools in %pool, other fixes