More fixes and updates.