Minor assertion fixes