Reenabled some stuff for this version.