Re-enable some stuff