Fixes and adjustments.