Fix bugs with results