Changed version; Cleaned up version mismatches