Additional fixes and adjustments