Final fixes as pointed out in the forum.