Additional fixes for unknown results