Some small fixes around files