Small fixes for version with two grains