Add final fixes after Olves comments