Bug fixes, prevent scheme file confusion with repeat data