Verbose fixes and file fixes