Fixes and adjustments