More fixes and patch.