Bug fixes for existing files