Minor changes for accept filename with and without /