Fixing up some compiler version issues.