Filehandler minor changes