Minor fixes, but about to roll back.