Try re-enabling some stuff