More fixes and patches.