Fix the miscellaneous warnings and errors that have crept in....