More fixes and adjustments