a few assertion fixes