Fixed non-failure ties; need to merge into master