Updates with some file fixes