Fixed warnings and a small bug with killer resets.