Fixing first wave of runtime errors.