Last fixes for the input flat files