Small sanity fixes in regards to filename length.