Missing files and various other clean up items