- Minor fix.
- Added some asserts.