Fixed file and parameter handling