A multitude of small corrections to get these files to compile without errors.