Cleaned up to compile against all new versions.