basic assertion fixes