Report II - fixes