Today I received the second set of proofs and managed to check all my corrections. And it looks good. Almost everything was corrected as I asked for. There were only 5 minor issues to be corrected.
So everything seems to be on schedule so that publiation date in July is still realistic.