Final fixes in several files