Minor fixes in the former files