Conservative fixes and tuning