Fix everything peter broke.