Applies several fixes to address issues shown by smoke tests.