Minor tweaks
Commented out assertion temporarily