More fixes, small changes.