More fixes and tunes.