tuning related fixes