Fixes and tuning