Some fixes and find .files as well