Small changes in filetype checking